Install PAM modules and systemd units into /usr
authorMichael Biebl <biebl@debian.org>
Mon, 22 Jan 2024 21:52:25 +0000 (22:52 +0100)
committerOtto Kekäläinen <otto@debian.org>
Tue, 13 Jan 2026 19:03:57 +0000 (19:03 +0000)
Since Debian trixie all files need to be installed into their canonical
location under /usr.

Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348
Forwarded: https://github.com/MariaDB/server/pull/4065

Gbp-Pq: Name install-files-into-usr.patch

cmake/install_layout.cmake

index 55e960a3c1572083c6af14c637051910ebb8f80f..d52836a4f4a1875b77286d53233da50bf46b8578 100644 (file)
@@ -196,10 +196,10 @@ SET(INSTALL_MYSQLDATADIR_DEB            "/var/lib/mysql")
 
 SET(INSTALL_RUNDATADIR_DEB              "/run/mysqld")
 SET(INSTALL_UNIX_ADDRDIR_DEB            "${INSTALL_RUNDATADIR_DEB}/mysqld.sock")
-SET(INSTALL_SYSTEMD_UNITDIR_DEB         "/lib/systemd/system")
+SET(INSTALL_SYSTEMD_UNITDIR_DEB         "/usr/lib/systemd/system")
 SET(INSTALL_SYSTEMD_SYSUSERSDIR_DEB     "/usr/lib/sysusers.d")
 SET(INSTALL_SYSTEMD_TMPFILESDIR_DEB     "/usr/lib/tmpfiles.d")
-SET(INSTALL_PAMDIR_DEB                  "/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security")
+SET(INSTALL_PAMDIR_DEB                  "/usr/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security")
 SET(INSTALL_PAMDATADIR_DEB              "/etc/security")
 
 #